merge emacs-23

diff --cc lisp/ChangeLog
index 419a61ed5f3046272fd7cc57c8feb9e4c29fa9d4,c4501dbc21900cddc591fe7eaec3ed982289539b..56dec3f94210510ac42a9106cf8a03e1d540c956
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,18 -1,21 +1,28 @@@
-  2010-10-10  Jan Djärv  <jan.h.d@swipnet.se>
-  
-       * term/ns-win.el (ns-right-alternate-modifier): New defvar.
-       (ns-right-option-modifier): New alias for ns-right-alternate-modifier.
-       (mac-right-option-modifier): New alias for ns-right-option-modifier.
-  
-       * cus-start.el (all): ns-right-alternate-modifier is new.
-  
 +2010-10-14  Kenichi Handa  <handa@m17n.org>
 +
 +      * ps-mule.el (ps-mule-font-spec-list): Delete it.  Not used
 +      anymore.
 +      (ps-mule-begin-job): Fix for the case that only ENCODING is set in
 +      a font-spec (bug#7197).
 +
+ 2010-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+       * mail/emacsbug.el (report-emacs-bug): Mention debbugs.gnu.org.
+ 
+ 2010-10-12  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * international/mule.el (define-coding-system):
+       * international/titdic-cnv.el (quail-cxterm-package-ext-info):
+       * composite.el (compose-region): Fix typo in docstring.
+ 
+ 2010-10-10  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * term/ns-win.el (ns-right-alternate-modifier): New defvar.
+       (ns-right-option-modifier): New alias for ns-right-alternate-modifier.
+       (mac-right-option-modifier): New alias for ns-right-option-modifier.
+ 
+       * cus-start.el (all): ns-right-alternate-modifier is new.
+ 
  2010-10-10  Andreas Schwab  <schwab@linux-m68k.org>
  
        * Makefile.in (ELCFILES): Update.